Auto merge of #1428 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 18 Mar 2015 17:43:25 +0000 (17:43 +0000)
committerbors <bors@rust-lang.org>
Wed, 18 Mar 2015 17:43:25 +0000 (17:43 +0000)

Trivial merge